Switched to not waiting to merge changes