Merged confilicts solved