Resolved some more conflicts