generated new application
resolved conflicts