Merge commits resolved