updated compilation process
resolve conflict