forced commit
Fixed merge conflicts