Little changes with reference
resolve conflicts