Resolved some merge conflicts and made other minor changes
Resolved some merge conflicts and made other minor changes

pecko/thindeck,pecko/thindeck,pecko/thindeck,pecko/thindeck,krzyk/thindeck,pecko/thindeck,krzyk/thindeck,pecko/thindeck,krzyk/thindeck