Revert "Merge master and solve conflict"

This reverts commit 9f7e95c2634ab319aab6bd971c97fb456c065e4c.