fixed hidden merge errors