Fixing conflict and back to where we left off