nicks
resolved conflicts