inittial project
remove conlfict file