looking at date stuff! -J
two people editing at once = bad idea…
just  commit the fucking changes already
Merge remote-tracking branch 'origin/master'
merged changes!