Fixed minor conflicts.