Attempt 3 at auto-merge