Please solve the conflicts :)