Git merge mess-ups fixed