fixed conflicts between amelia and julia