UPDATED: A lot of stuff
Resolve conflicts