Tried to solve conflicts.