You can always merge feature branches together to check for conflicts