creating conflict
conflic resolved