resolve conflict
cleanup, allow executables