added forgotten close slash
resolved conflicts