Merged + resolved conflicts