Resolved elimisteve conflicts