hopefully fixed more merge errors