Another conflicting commit
Resolved conflicts