Merges files together using a best-effort merge - View it on GitHub