new feature added
customer added
resolve conflict solved