Merge working correctly, only thing left is merging comments.