2 things... basically nothing... stupid git
suck it merge conflicts - I win