Fixed some merge conflict troubles