second commit?
Resolved conflict
what the fuck is happening