Patch conflict

This PR adds the merge conflicts, patch and diff functionality