Resolved Some conflicts