Solves merge conflicts

This solves the merge conflicts in the development branch --> #95