fixing features conflict