merge comflicts fixed for alex
merge conflict resolved