fixing more merge commits