sync

Safe synchronization of your branch with main, including conflict resolution and safety checks. Works on both feature branches and main branch.