Minor changed before doing conflict prone changes ;)