Still fixing merge errors