Resolved even more merge conflicts