merging code for the first time