commiting 2nd time
conflicts resovled