fixing more merge conflicts and reformatting code