Resolving bugs and stuff
Mering conflict