Random changes
Solved merge conflicts