Resolved additional merge conflicts.