Added ability to handle merges a little