Fixed tickets
Fixed Conflicts