merge before pulling code from other machine
fixed conflicts