Resolved mistakes I did during merge