Confilct solving.....
Conflict solved...