Resolved a lot of merge conflics.