corrected merge (git is not being my friend)