resolve conflict
Check fib on compiler