Fixed conflict issues, merged with previous commit for chronological order