Still fixing the merge errors