Cleaned up conflict on Master