[0100] Solved merge conflict