Changed same file
Resolved conflicts