Resolved additional factory conflicts previously missed