Resolved additional merge conflicts