Hopefully fixed merged conflicts