Resolved the line that caused conflict, and brought all the changes together.