Fixed stuff in master
Resolve merge conflict