Resolving merge section left in last commit