Some new Features
Solving merge conflicts