04-20 Merging the Changes Together